diff options
Diffstat (limited to 'tools/source/stream')
-rw-r--r-- | tools/source/stream/cachestr.cxx | 32 | ||||
-rw-r--r-- | tools/source/stream/makefile.mk | 58 | ||||
-rwxr-xr-x[-rw-r--r--] | tools/source/stream/stream.cxx | 170 | ||||
-rw-r--r-- | tools/source/stream/strmos2.cxx | 92 | ||||
-rw-r--r-- | tools/source/stream/strmwnt.cxx | 86 | ||||
-rw-r--r-- | tools/source/stream/vcompat.cxx | 6 |
6 files changed, 208 insertions, 236 deletions
diff --git a/tools/source/stream/cachestr.cxx b/tools/source/stream/cachestr.cxx index f68f563d427c..ab8a2e7c7806 100644 --- a/tools/source/stream/cachestr.cxx +++ b/tools/source/stream/cachestr.cxx @@ -40,13 +40,13 @@ |* *************************************************************************/ -SvCacheStream::SvCacheStream( ULONG nMaxMemSize ) +SvCacheStream::SvCacheStream( sal_uIntPtr nMaxMemSize ) { if( !nMaxMemSize ) nMaxMemSize = 20480; - SvStream::bIsWritable = TRUE; + SvStream::bIsWritable = sal_True; nMaxSize = nMaxMemSize; - bPersistent = FALSE; + bPersistent = sal_False; pSwapStream = 0; pCurrentStream = new SvMemoryStream( nMaxMemSize ); pTempFile = 0; @@ -59,8 +59,8 @@ SvCacheStream::SvCacheStream( ULONG nMaxMemSize ) *************************************************************************/ SvCacheStream::SvCacheStream( const String &rFileName, - ULONG nExpectedSize, - ULONG nMaxMemSize ) + sal_uIntPtr nExpectedSize, + sal_uIntPtr nMaxMemSize ) { if( !nMaxMemSize ) nMaxMemSize = 20480; @@ -70,9 +70,9 @@ SvCacheStream::SvCacheStream( const String &rFileName, else if( !nExpectedSize ) nExpectedSize = 4096; - SvStream::bIsWritable = TRUE; + SvStream::bIsWritable = sal_True; nMaxSize = nMaxMemSize; - bPersistent = TRUE; + bPersistent = sal_True; aFileName = rFileName; pSwapStream = 0; pCurrentStream = new SvMemoryStream( nExpectedSize ); @@ -94,7 +94,7 @@ SvCacheStream::~SvCacheStream() if( pSwapStream && !bPersistent && pTempFile ) { // temporaeres File loeschen - pTempFile->EnableKillingFile( TRUE ); + pTempFile->EnableKillingFile( sal_True ); } delete pTempFile; @@ -130,7 +130,7 @@ void SvCacheStream::SwapOut() } } - ULONG nPos = pCurrentStream->Tell(); + sal_uIntPtr nPos = pCurrentStream->Tell(); pCurrentStream->Seek( 0 ); if( !pSwapStream ) pSwapStream = new SvFileStream( aFileName, STREAM_READWRITE | STREAM_TRUNC ); @@ -148,7 +148,7 @@ void SvCacheStream::SwapOut() |* *************************************************************************/ -ULONG SvCacheStream::GetData( void* pData, ULONG nSize ) +sal_uIntPtr SvCacheStream::GetData( void* pData, sal_uIntPtr nSize ) { return pCurrentStream->Read( pData, nSize ); } @@ -159,7 +159,7 @@ ULONG SvCacheStream::GetData( void* pData, ULONG nSize ) |* *************************************************************************/ -ULONG SvCacheStream::PutData( const void* pData, ULONG nSize ) +sal_uIntPtr SvCacheStream::PutData( const void* pData, sal_uIntPtr nSize ) { // lieber unnoetig auslagern als unnoetig umkopieren if( pCurrentStream != pSwapStream @@ -174,7 +174,7 @@ ULONG SvCacheStream::PutData( const void* pData, ULONG nSize ) |* *************************************************************************/ -ULONG SvCacheStream::SeekPos( ULONG nPos ) +sal_uIntPtr SvCacheStream::SeekPos( sal_uIntPtr nPos ) { return pCurrentStream->Seek( nPos ); } @@ -214,7 +214,7 @@ const void* SvCacheStream::GetBuffer() |* *************************************************************************/ -void SvCacheStream::SetSize( ULONG nSize ) +void SvCacheStream::SetSize( sal_uIntPtr nSize ) { pCurrentStream->SetStreamSize( nSize ); } @@ -225,13 +225,13 @@ void SvCacheStream::SetSize( ULONG nSize ) |* *************************************************************************/ -ULONG SvCacheStream::GetSize() +sal_uIntPtr SvCacheStream::GetSize() { // ACHTUNG: SvMemoryStream::GetSize() gibt Groesse // des allozierten Buffers zurueck Flush(); - ULONG nTemp = Tell(); - ULONG nLength = Seek( STREAM_SEEK_TO_END ); + sal_uIntPtr nTemp = Tell(); + sal_uIntPtr nLength = Seek( STREAM_SEEK_TO_END ); Seek( nTemp ); return nLength; } diff --git a/tools/source/stream/makefile.mk b/tools/source/stream/makefile.mk deleted file mode 100644 index ee548934c6c6..000000000000 --- a/tools/source/stream/makefile.mk +++ /dev/null @@ -1,58 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=tools -TARGET=stream - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES= $(SLO)$/stream.obj \ - $(SLO)$/strmsys.obj \ - $(SLO)$/cachestr.obj \ - $(SLO)$/vcompat.obj - -OBJFILES+= $(OBJ)$/stream.obj \ - $(OBJ)$/strmsys.obj \ - $(OBJ)$/cachestr.obj \ - $(OBJ)$/vcompat.obj - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - -$(SLO)$/strmsys.obj : \ - strmwnt.cxx \ - strmos2.cxx \ - strmunx.cxx - diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx index 879ce44d6d83..bdaf4422f4bf 100644..100755 --- a/tools/source/stream/stream.cxx +++ b/tools/source/stream/stream.cxx @@ -118,7 +118,7 @@ inline static void SwapDouble( double& r ) { if( sizeof(double) != 8 ) { - DBG_ASSERT( FALSE, "Can only swap 8-Byte-doubles\n" ); + DBG_ASSERT( sal_False, "Can only swap 8-Byte-doubles\n" ); } else { @@ -168,7 +168,7 @@ if( (tmp==STREAM_IO_WRITE) && sizeof(datatype) <= nBufFree)\ if( nBufActualPos > nBufActualLen )\ nBufActualLen = nBufActualPos;\ pBufPos += sizeof(datatype);\ - bIsDirty = TRUE;\ + bIsDirty = sal_True;\ }\ else\ Write( (char*)&value, sizeof(datatype) );\ @@ -444,7 +444,7 @@ void SvStream::ImpInit() eStreamCharSet = osl_getThreadTextEncoding(); // eTargetCharSet = osl_getThreadTextEncoding(); nCryptMask = 0; - bIsEof = FALSE; + bIsEof = sal_False; #if defined UNX eLineDelimiter = LINEEND_LF; // UNIX-Format #else @@ -455,9 +455,9 @@ void SvStream::ImpInit() nBufFilePos = 0; nBufActualPos = 0; - bIsDirty = FALSE; - bIsConsistent = TRUE; - bIsWritable = TRUE; + bIsDirty = sal_False; + bIsConsistent = sal_True; + bIsWritable = sal_True; pRWBuf = 0; pBufPos = 0; @@ -544,7 +544,7 @@ sal_uInt16 SvStream::IsA() const void SvStream::ClearError() { - bIsEof = FALSE; + bIsEof = sal_False; nError = SVSTREAM_OK; } @@ -570,13 +570,13 @@ void SvStream::SetError( sal_uInt32 nErrorCode ) void SvStream::SetNumberFormatInt( sal_uInt16 nNewFormat ) { nNumberFormatInt = nNewFormat; - bSwap = FALSE; + bSwap = sal_False; #ifdef OSL_BIGENDIAN if( nNumberFormatInt == NUMBERFORMAT_INT_LITTLEENDIAN ) - bSwap = TRUE; + bSwap = sal_True; #else if( nNumberFormatInt == NUMBERFORMAT_INT_BIGENDIAN ) - bSwap = TRUE; + bSwap = sal_True; #endif } @@ -605,8 +605,8 @@ void SvStream::SetBufferSize( sal_uInt16 nBufferSize ) nBufActualPos = 0; nBufSize = nBufferSize; if( nBufSize ) - pRWBuf = new BYTE[ nBufSize ]; - bIsConsistent = TRUE; + pRWBuf = new sal_uInt8[ nBufSize ]; + bIsConsistent = sal_True; pBufPos = pRWBuf; eIOMode = STREAM_IO_DONTKNOW; if( !bDontSeek ) @@ -625,11 +625,11 @@ void SvStream::ClearBuffer() nBufActualPos = 0; nBufFilePos = 0; pBufPos = pRWBuf; - bIsDirty = FALSE; - bIsConsistent = TRUE; + bIsDirty = sal_False; + bIsConsistent = sal_True; eIOMode = STREAM_IO_DONTKNOW; - bIsEof = FALSE; + bIsEof = sal_False; } /************************************************************************* @@ -662,7 +662,7 @@ sal_Bool SvStream::ReadByteStringLine( String& rStr, rtl_TextEncoding eSrcCharSe sal_Bool SvStream::ReadLine( ByteString& rStr ) { sal_Char buf[256+1]; - sal_Bool bEnd = FALSE; + sal_Bool bEnd = sal_False; sal_Size nOldFilePos = Tell(); sal_Char c = 0; sal_Size nTotalLen = 0; @@ -678,8 +678,8 @@ sal_Bool SvStream::ReadLine( ByteString& rStr ) if ( rStr.Len() == 0 ) { // der allererste Blockread hat fehlgeschlagen -> Abflug - bIsEof = TRUE; - return FALSE; + bIsEof = sal_True; + return sal_False; } else break; @@ -691,7 +691,7 @@ sal_Bool SvStream::ReadLine( ByteString& rStr ) c = buf[j]; if ( c == '\n' || c == '\r' ) { - bEnd = TRUE; + bEnd = sal_True; break; } // erAck 26.02.01: Old behavior was no special treatment of '\0' @@ -711,7 +711,7 @@ sal_Bool SvStream::ReadLine( ByteString& rStr ) } if ( !bEnd && !GetError() && rStr.Len() ) - bEnd = TRUE; + bEnd = sal_True; nOldFilePos += nTotalLen; if( Tell() > nOldFilePos ) @@ -729,14 +729,14 @@ sal_Bool SvStream::ReadLine( ByteString& rStr ) } if ( bEnd ) - bIsEof = FALSE; + bIsEof = sal_False; return bEnd; } sal_Bool SvStream::ReadUniStringLine( String& rStr ) { sal_Unicode buf[256+1]; - sal_Bool bEnd = FALSE; + sal_Bool bEnd = sal_False; sal_Size nOldFilePos = Tell(); sal_Unicode c = 0; sal_Size nTotalLen = 0; @@ -755,8 +755,8 @@ sal_Bool SvStream::ReadUniStringLine( String& rStr ) if ( rStr.Len() == 0 ) { // der allererste Blockread hat fehlgeschlagen -> Abflug - bIsEof = TRUE; - return FALSE; + bIsEof = sal_True; + return sal_False; } else break; @@ -770,7 +770,7 @@ sal_Bool SvStream::ReadUniStringLine( String& rStr ) c = buf[j]; if ( c == '\n' || c == '\r' ) { - bEnd = TRUE; + bEnd = sal_True; break; } // erAck 26.02.01: Old behavior was no special treatment of '\0' @@ -790,7 +790,7 @@ sal_Bool SvStream::ReadUniStringLine( String& rStr ) } if ( !bEnd && !GetError() && rStr.Len() ) - bEnd = TRUE; + bEnd = sal_True; nOldFilePos += nTotalLen * sizeof(sal_Unicode); if( Tell() > nOldFilePos ) @@ -808,7 +808,7 @@ sal_Bool SvStream::ReadUniStringLine( String& rStr ) } if ( bEnd ) - bIsEof = FALSE; + bIsEof = sal_False; return bEnd; } @@ -832,7 +832,7 @@ sal_Bool SvStream::ReadCString( ByteString& rStr ) rStr.Erase(); sal_Char buf[ 256 + 1 ]; - sal_Bool bEnd = FALSE; + sal_Bool bEnd = sal_False; sal_Size nFilePos = Tell(); while( !bEnd && !GetError() ) @@ -1008,7 +1008,7 @@ sal_Bool SvStream::WriteUniOrByteChar( sal_Unicode ch, rtl_TextEncoding eDestCha sal_Bool SvStream::StartWritingUnicodeText() { - SetEndianSwap( FALSE ); // write native format + SetEndianSwap( sal_False ); // write native format // BOM, Byte Order Mark, U+FEFF, see // http://www.unicode.org/faq/utf_bom.html#BOM // Upon read: 0xfeff(-257) => no swap; 0xfffe(-2) => swap @@ -1022,21 +1022,59 @@ sal_Bool SvStream::StartWritingUnicodeText() |* *************************************************************************/ -sal_Bool SvStream::StartReadingUnicodeText() +sal_Bool SvStream::StartReadingUnicodeText( rtl_TextEncoding eReadBomCharSet ) { + if (!( eReadBomCharSet == RTL_TEXTENCODING_DONTKNOW || + eReadBomCharSet == RTL_TEXTENCODING_UNICODE || + eReadBomCharSet == RTL_TEXTENCODING_UTF8)) + return sal_True; // nothing to read + + bool bTryUtf8 = false; sal_uInt16 nFlag; + sal_sSize nBack = sizeof(nFlag); *this >> nFlag; switch ( nFlag ) { case 0xfeff : - // native + // native UTF-16 + if ( eReadBomCharSet == RTL_TEXTENCODING_DONTKNOW || + eReadBomCharSet == RTL_TEXTENCODING_UNICODE) + nBack = 0; break; case 0xfffe : - SetEndianSwap( !bSwap ); + // swapped UTF-16 + if ( eReadBomCharSet == RTL_TEXTENCODING_DONTKNOW || + eReadBomCharSet == RTL_TEXTENCODING_UNICODE) + { + SetEndianSwap( !bSwap ); + nBack = 0; + } + break; + case 0xefbb : + if (nNumberFormatInt == NUMBERFORMAT_INT_BIGENDIAN && + (eReadBomCharSet == RTL_TEXTENCODING_DONTKNOW || + eReadBomCharSet == RTL_TEXTENCODING_UTF8)) + bTryUtf8 = true; + break; + case 0xbbef : + if (nNumberFormatInt == NUMBERFORMAT_INT_LITTLEENDIAN && + (eReadBomCharSet == RTL_TEXTENCODING_DONTKNOW || + eReadBomCharSet == RTL_TEXTENCODING_UTF8)) + bTryUtf8 = true; break; default: - SeekRel( -((sal_sSize)sizeof(nFlag)) ); // no BOM, pure data + ; // nothing + } + if (bTryUtf8) + { + sal_uChar nChar; + nBack += sizeof(nChar); + *this >> nChar; + if (nChar == 0xbf) + nBack = 0; // it is UTF-8 } + if (nBack) + SeekRel( -nBack ); // no BOM, pure data return nError == SVSTREAM_OK; } @@ -1370,7 +1408,7 @@ SvStream& SvStream::operator<< ( signed char v ) if( nBufActualPos > nBufActualLen ) // Append ? nBufActualLen = nBufActualPos; nBufFree--; // = sizeof(char); - bIsDirty = TRUE; + bIsDirty = sal_True; } else Write( (char*)&v, sizeof(signed char) ); @@ -1391,7 +1429,7 @@ SvStream& SvStream::operator<< ( char v ) if( nBufActualPos > nBufActualLen ) // Append ? nBufActualLen = nBufActualPos; nBufFree--; // = sizeof(char); - bIsDirty = TRUE; + bIsDirty = sal_True; } else Write( (char*)&v, sizeof(char) ); @@ -1410,7 +1448,7 @@ SvStream& SvStream::operator<< ( unsigned char v ) if( nBufActualPos > nBufActualLen ) // Append ? nBufActualLen = nBufActualPos; nBufFree--; - bIsDirty = TRUE; + bIsDirty = sal_True; } else Write( (char*)&v, sizeof(char) ); @@ -1607,7 +1645,7 @@ sal_Size SvStream::Read( void* pData, sal_Size nCount ) CryptAndWriteBuffer(pRWBuf, nBufActualLen); else PutData( pRWBuf, nBufActualLen ); - bIsDirty = FALSE; + bIsDirty = sal_False; } // passt der Datenblock in den Puffer ? @@ -1652,10 +1690,10 @@ sal_Size SvStream::Read( void* pData, sal_Size nCount ) } } } - bIsEof = FALSE; + bIsEof = sal_False; nBufFree = nBufActualLen - nBufActualPos; if( nCount != nSaveCount && nError != ERRCODE_IO_PENDING ) - bIsEof = TRUE; + bIsEof = sal_True; if( nCount == nSaveCount && nError == ERRCODE_IO_PENDING ) nError = ERRCODE_NONE; return nCount; @@ -1699,7 +1737,7 @@ sal_Size SvStream::Write( const void* pData, sal_Size nCount ) nBufActualLen = nBufActualPos; pBufPos += nCount; - bIsDirty = TRUE; + bIsDirty = sal_True; } else { @@ -1711,7 +1749,7 @@ sal_Size SvStream::Write( const void* pData, sal_Size nCount ) CryptAndWriteBuffer( pRWBuf, (sal_Size)nBufActualLen ); else PutData( pRWBuf, nBufActualLen ); - bIsDirty = FALSE; + bIsDirty = sal_False; } // passt der Block in den Puffer ? @@ -1739,7 +1777,7 @@ sal_Size SvStream::Write( const void* pData, sal_Size nCount ) nBufActualPos = (sal_uInt16)nCount; pBufPos = pRWBuf + nCount; nBufActualLen = (sal_uInt16)nCount; - bIsDirty = TRUE; + bIsDirty = sal_True; } } nBufFree = nBufSize - nBufActualPos; @@ -1757,7 +1795,7 @@ sal_Size SvStream::Seek( sal_Size nFilePos ) { eIOMode = STREAM_IO_DONTKNOW; - bIsEof = FALSE; + bIsEof = sal_False; if( !pRWBuf ) { nBufFilePos = SeekPos( nFilePos ); @@ -1783,7 +1821,7 @@ sal_Size SvStream::Seek( sal_Size nFilePos ) CryptAndWriteBuffer( pRWBuf, nBufActualLen ); else PutData( pRWBuf, nBufActualLen ); - bIsDirty = FALSE; + bIsDirty = sal_False; } nBufActualLen = 0; nBufActualPos = 0; @@ -1815,7 +1853,7 @@ void SvStream::Flush() else if( PutData( pRWBuf, nBufActualLen ) != nBufActualLen ) SetError( SVSTREAM_WRITE_ERROR ); - bIsDirty = FALSE; + bIsDirty = sal_False; } if( bIsWritable ) FlushData(); @@ -1855,9 +1893,9 @@ SvStream& SvStream::PutBack( char aCh ) CryptAndWriteBuffer( pRWBuf, nBufActualLen ); else PutData( pRWBuf, nBufActualLen ); - bIsDirty = FALSE; + bIsDirty = sal_False; } - bIsConsistent = FALSE; // Puffer enthaelt jetzt TRASH + bIsConsistent = sal_False; // Puffer enthaelt jetzt TRASH if( nBufActualPos ) { // 1. Fall @@ -1886,7 +1924,7 @@ SvStream& SvStream::PutBack( char aCh ) *pRWBuf = aCh; } eIOMode = STREAM_IO_DONTKNOW; - bIsEof = FALSE; + bIsEof = sal_False; return *this; } @@ -1921,7 +1959,7 @@ void SvStream::RefreshBuffer() CryptAndWriteBuffer( pRWBuf, (sal_Size)nBufActualLen ); else PutData( pRWBuf, nBufActualLen ); - bIsDirty = FALSE; + bIsDirty = sal_False; } SeekPos( nBufFilePos ); nBufActualLen = (sal_uInt16)GetData( pRWBuf, nBufSize ); @@ -1929,7 +1967,7 @@ void SvStream::RefreshBuffer() nError = ERRCODE_NONE; if( nCryptMask ) EncryptBuffer(pRWBuf, (sal_Size)nBufActualLen); - bIsConsistent = TRUE; + bIsConsistent = sal_True; eIOMode = STREAM_IO_DONTKNOW; } @@ -1999,7 +2037,7 @@ SvStream& SvStream::ReadNumber( long& rLong ) rLong = strtol( buf, &pEndPtr, (int)nRadix ); nFPtr += ( (sal_Size)pEndPtr - (sal_Size)(&(buf[0])) ); Seek( nFPtr ); - bIsEof = FALSE; + bIsEof = sal_False; return *this; } @@ -2024,7 +2062,7 @@ SvStream& SvStream::ReadNumber( sal_uInt32& rUInt32 ) rUInt32 = strtoul( buf, &pEndPtr, (int)nRadix ); nFPtr += ( (sal_uIntPtr)pEndPtr - (sal_uIntPtr)buf ); Seek( nFPtr ); - bIsEof = FALSE; + bIsEof = sal_False; return *this; } @@ -2049,7 +2087,7 @@ SvStream& SvStream::ReadNumber( double& rDouble ) rDouble = strtod( buf, &pEndPtr ); nFPtr += ( (sal_Size)pEndPtr - (sal_Size)buf ); Seek( nFPtr ); - bIsEof = FALSE; + bIsEof = sal_False; return *this; } @@ -2204,7 +2242,7 @@ sal_Bool SvStream::EncryptBuffer(void* pStart, sal_Size nLen) aCh ^= nMask; *pTemp = aCh; } - return TRUE; + return sal_True; } /************************************************************************* @@ -2361,12 +2399,12 @@ SvMemoryStream::SvMemoryStream( void* pBuffer, sal_Size bufSize, StreamMode eMode ) { if( eMode & STREAM_WRITE ) - bIsWritable = TRUE; + bIsWritable = sal_True; else - bIsWritable = FALSE; + bIsWritable = sal_False; nEndOfData = bufSize; - bOwnsData = FALSE; - pBuf = (BYTE *) pBuffer; + bOwnsData = sal_False; + pBuf = (sal_uInt8 *) pBuffer; nResize = 0L; nSize = bufSize; nPos = 0L; @@ -2381,8 +2419,8 @@ SvMemoryStream::SvMemoryStream( void* pBuffer, sal_Size bufSize, SvMemoryStream::SvMemoryStream( sal_Size nInitSize, sal_Size nResizeOffset ) { - bIsWritable = TRUE; - bOwnsData = TRUE; + bIsWritable = sal_True; + bOwnsData = sal_True; nEndOfData = 0L; nResize = nResizeOffset; nPos = 0; @@ -2448,7 +2486,7 @@ void* SvMemoryStream::SetBuffer( void* pNewBuf, sal_Size nCount, else pResult = pBuf; - pBuf = (BYTE *) pNewBuf; + pBuf = (sal_uInt8 *) pNewBuf; nPos = 0; nSize = nCount; nResize = 0; @@ -2612,7 +2650,7 @@ void SvMemoryStream::ResetError() sal_Bool SvMemoryStream::AllocateMemory( sal_Size nNewSize ) { - pBuf = new BYTE[nNewSize]; + pBuf = new sal_uInt8[nNewSize]; return( pBuf != 0 ); } @@ -2624,18 +2662,18 @@ sal_Bool SvMemoryStream::AllocateMemory( sal_Size nNewSize ) sal_Bool SvMemoryStream::ReAllocateMemory( long nDiff ) { - sal_Bool bRetVal = FALSE; + sal_Bool bRetVal = sal_False; long nTemp = (long)nSize; nTemp += nDiff; sal_Size nNewSize = (sal_Size)nTemp; if( nNewSize ) { - BYTE* pNewBuf = new BYTE[nNewSize]; + sal_uInt8* pNewBuf = new sal_uInt8[nNewSize]; if( pNewBuf ) { - bRetVal = TRUE; // Success! + bRetVal = sal_True; // Success! if( nNewSize < nSize ) // Verkleinern ? { memcpy( pNewBuf, pBuf, (size_t)nNewSize ); @@ -2657,7 +2695,7 @@ sal_Bool SvMemoryStream::ReAllocateMemory( long nDiff ) } else { - bRetVal = TRUE; + bRetVal = sal_True; FreeMemory(); pBuf = 0; nSize = 0; diff --git a/tools/source/stream/strmos2.cxx b/tools/source/stream/strmos2.cxx index 90224ccbc91f..b41c2548a2cd 100644 --- a/tools/source/stream/strmos2.cxx +++ b/tools/source/stream/strmos2.cxx @@ -58,20 +58,20 @@ class StreamData { public: HFILE hFile; - BOOL bIsEof; + sal_Bool bIsEof; StreamData() { hFile = 0; - bIsEof = TRUE; + bIsEof = sal_True; } }; // ----------------------------------------------------------------------- -ULONG GetSvError( APIRET nPMError ) +sal_uIntPtr GetSvError( APIRET nPMError ) { - static struct { APIRET pm; ULONG sv; } errArr[] = + static struct { APIRET pm; sal_uIntPtr sv; } errArr[] = { { ERROR_FILE_NOT_FOUND, SVSTREAM_FILE_NOT_FOUND }, { ERROR_PATH_NOT_FOUND, SVSTREAM_PATH_NOT_FOUND }, @@ -92,7 +92,7 @@ ULONG GetSvError( APIRET nPMError ) { 0xFFFF, SVSTREAM_GENERALERROR } }; - ULONG nRetVal = SVSTREAM_GENERALERROR; // Standardfehler + sal_uIntPtr nRetVal = SVSTREAM_GENERALERROR; // Standardfehler int i=0; do { @@ -115,9 +115,9 @@ ULONG GetSvError( APIRET nPMError ) SvFileStream::SvFileStream( const String& rFileName, StreamMode nOpenMode ) { - bIsOpen = FALSE; + bIsOpen = sal_False; nLockCounter = 0; - bIsWritable = FALSE; + bIsWritable = sal_False; pInstanceData = new StreamData; SetBufferSize( 8192 ); @@ -137,9 +137,9 @@ SvFileStream::SvFileStream( const String& rFileName, StreamMode nOpenMode ) SvFileStream::SvFileStream() { - bIsOpen = FALSE; + bIsOpen = sal_False; nLockCounter = 0; - bIsWritable = FALSE; + bIsWritable = sal_False; pInstanceData = new StreamData; SetBufferSize( 8192 ); } @@ -163,9 +163,9 @@ SvFileStream::~SvFileStream() |* *************************************************************************/ -ULONG SvFileStream::GetFileHandle() const +sal_uIntPtr SvFileStream::GetFileHandle() const { - return (ULONG)pInstanceData->hFile; + return (sal_uIntPtr)pInstanceData->hFile; } /************************************************************************* @@ -174,7 +174,7 @@ ULONG SvFileStream::GetFileHandle() const |* *************************************************************************/ -USHORT SvFileStream::IsA() const +sal_uInt16 SvFileStream::IsA() const { return ID_FILESTREAM; } @@ -187,7 +187,7 @@ USHORT SvFileStream::IsA() const |* *************************************************************************/ -ULONG SvFileStream::GetData( void* pData, ULONG nSize ) +sal_uIntPtr SvFileStream::GetData( void* pData, sal_uIntPtr nSize ) { #ifdef DBG_UTIL ByteString aTraceStr( "SvFileStream::GetData(): " ); @@ -197,7 +197,7 @@ ULONG SvFileStream::GetData( void* pData, ULONG nSize ) DBG_TRACE( aTraceStr.GetBuffer() ); #endif - ULONG nCount = 0L; + sal_uIntPtr nCount = 0L; if( IsOpen() ) { APIRET nResult; @@ -214,7 +214,7 @@ ULONG SvFileStream::GetData( void* pData, ULONG nSize ) |* *************************************************************************/ -ULONG SvFileStream::PutData( const void* pData, ULONG nSize ) +sal_uIntPtr SvFileStream::PutData( const void* pData, sal_uIntPtr nSize ) { #ifdef DBG_UTIL ByteString aTraceStr( "SvFileStrean::PutData: " ); @@ -224,7 +224,7 @@ ULONG SvFileStream::PutData( const void* pData, ULONG nSize ) DBG_TRACE( aTraceStr.GetBuffer() ); #endif - ULONG nCount = 0L; + sal_uIntPtr nCount = 0L; if( IsOpen() ) { APIRET nResult; @@ -243,9 +243,9 @@ ULONG SvFileStream::PutData( const void* pData, ULONG nSize ) |* *************************************************************************/ -ULONG SvFileStream::SeekPos( ULONG nPos ) +sal_uIntPtr SvFileStream::SeekPos( sal_uIntPtr nPos ) { - ULONG nNewPos = 0L; + sal_uIntPtr nNewPos = 0L; if( IsOpen() ) { APIRET nResult; @@ -271,9 +271,9 @@ ULONG SvFileStream::SeekPos( ULONG nPos ) |* *************************************************************************/ /* -ULONG SvFileStream::Tell() +sal_uIntPtr SvFileStream::Tell() { - ULONG nPos = 0L; + sal_uIntPtr nPos = 0L; if( IsOpen() ) { @@ -309,9 +309,9 @@ void SvFileStream::FlushData() |* *************************************************************************/ -sal_Bool SvFileStream::LockRange( ULONG nByteOffset, ULONG nBytes ) +sal_Bool SvFileStream::LockRange( sal_uIntPtr nByteOffset, sal_uIntPtr nBytes ) { - sal_Bool bRetVal = FALSE; + sal_Bool bRetVal = sal_False; if( IsOpen() ) { APIRET nResult; @@ -330,7 +330,7 @@ sal_Bool SvFileStream::LockRange( ULONG nByteOffset, ULONG nBytes ) if( nResult ) SetError(::GetSvError(nResult) ); else - bRetVal = TRUE; + bRetVal = sal_True; } return bRetVal; } @@ -341,9 +341,9 @@ sal_Bool SvFileStream::LockRange( ULONG nByteOffset, ULONG nBytes ) |* *************************************************************************/ -sal_Bool SvFileStream::UnlockRange( ULONG nByteOffset, ULONG nBytes ) +sal_Bool SvFileStream::UnlockRange( sal_uIntPtr nByteOffset, sal_uIntPtr nBytes ) { - sal_Bool bRetVal = FALSE; + sal_Bool bRetVal = sal_False; if( IsOpen() ) { APIRET nResult; @@ -362,7 +362,7 @@ sal_Bool SvFileStream::UnlockRange( ULONG nByteOffset, ULONG nBytes ) if( nResult ) SetError(::GetSvError(nResult) ); else - bRetVal = TRUE; + bRetVal = sal_True; } return bRetVal; } @@ -375,19 +375,19 @@ sal_Bool SvFileStream::UnlockRange( ULONG nByteOffset, ULONG nBytes ) sal_Bool SvFileStream::LockFile() { - sal_Bool bRetVal = FALSE; + sal_Bool bRetVal = sal_False; if( !nLockCounter ) { if( LockRange( 0L, LONG_MAX ) ) { nLockCounter = 1; - bRetVal = TRUE; + bRetVal = sal_True; } } else { nLockCounter++; - bRetVal = TRUE; + bRetVal = sal_True; } return bRetVal; } @@ -400,7 +400,7 @@ sal_Bool SvFileStream::LockFile() sal_Bool SvFileStream::UnlockFile() { - sal_Bool bRetVal = FALSE; + sal_Bool bRetVal = sal_False; if( nLockCounter > 0) { if( nLockCounter == 1) @@ -408,13 +408,13 @@ sal_Bool SvFileStream::UnlockFile() if( UnlockRange( 0L, LONG_MAX ) ) { nLockCounter = 0; - bRetVal = TRUE; + bRetVal = sal_True; } } else { nLockCounter--; - bRetVal = TRUE; + bRetVal = sal_True; } } return bRetVal; @@ -437,10 +437,10 @@ void SvFileStream::Open( const String& rFilename, StreamMode nOpenMode ) Close(); SvStream::ClearBuffer(); - ULONG nActionTaken; - ULONG nOpenAction = 0L; - ULONG nShareBits = 0L; - ULONG nReadWriteBits = 0L; + sal_uIntPtr nActionTaken; + sal_uIntPtr nOpenAction = 0L; + sal_uIntPtr nShareBits = 0L; + sal_uIntPtr nReadWriteBits = 0L; eStreamMode = nOpenMode; eStreamMode &= ~STREAM_TRUNC; // beim ReOpen nicht cutten @@ -508,7 +508,7 @@ void SvFileStream::Open( const String& rFilename, StreamMode nOpenMode ) if( nRet == ERROR_TOO_MANY_OPEN_FILES ) { long nToAdd = 10; - ULONG nCurMaxFH; + sal_uIntPtr nCurMaxFH; nRet = DosSetRelMaxFH( &nToAdd, &nCurMaxFH ); nRet = DosOpen( aFileNameA.GetBuffer(), &pInstanceData->hFile, &nActionTaken, 0L, FILE_NORMAL, nOpenAction, @@ -526,15 +526,15 @@ void SvFileStream::Open( const String& rFilename, StreamMode nOpenMode ) if( nRet ) { - bIsOpen = FALSE; + bIsOpen = sal_False; SetError(::GetSvError(nRet) ); } else { - bIsOpen = TRUE; - pInstanceData->bIsEof = FALSE; + bIsOpen = sal_True; + pInstanceData->bIsEof = sal_False; if( nReadWriteBits != OPEN_ACCESS_READONLY ) - bIsWritable = TRUE; + bIsWritable = sal_True; } } @@ -575,10 +575,10 @@ void SvFileStream::Close() DosClose( pInstanceData->hFile ); } - bIsOpen = FALSE; + bIsOpen = sal_False; nLockCounter= 0; - bIsWritable = FALSE; - pInstanceData->bIsEof = TRUE; + bIsWritable = sal_False; + pInstanceData->bIsEof = sal_True; SvStream::ClearBuffer(); SvStream::ClearError(); } @@ -602,7 +602,7 @@ void SvFileStream::ResetError() |* *************************************************************************/ -void SvFileStream::SetSize( ULONG nSize ) +void SvFileStream::SetSize( sal_uIntPtr nSize ) { if( IsOpen() ) { @@ -612,4 +612,4 @@ void SvFileStream::SetSize( ULONG nSize ) } } -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file diff --git a/tools/source/stream/strmwnt.cxx b/tools/source/stream/strmwnt.cxx index 992bad47e62a..d05f54c728bd 100644 --- a/tools/source/stream/strmwnt.cxx +++ b/tools/source/stream/strmwnt.cxx @@ -64,9 +64,9 @@ public: // ----------------------------------------------------------------------- -static ULONG GetSvError( DWORD nWntError ) +static sal_uIntPtr GetSvError( DWORD nWntError ) { - static struct { DWORD wnt; ULONG sv; } errArr[] = + static struct { DWORD wnt; sal_uIntPtr sv; } errArr[] = { { ERROR_SUCCESS, SVSTREAM_OK }, { ERROR_ACCESS_DENIED, SVSTREAM_ACCESS_DENIED }, @@ -106,7 +106,7 @@ static ULONG GetSvError( DWORD nWntError ) { (DWORD)0xFFFFFFFF, SVSTREAM_GENERALERROR } }; - ULONG nRetVal = SVSTREAM_GENERALERROR; // Standardfehler + sal_uIntPtr nRetVal = SVSTREAM_GENERALERROR; // Standardfehler int i=0; do { @@ -128,9 +128,9 @@ static ULONG GetSvError( DWORD nWntError ) SvFileStream::SvFileStream( const String& rFileName, StreamMode nMode ) { - bIsOpen = FALSE; + bIsOpen = sal_False; nLockCounter = 0; - bIsWritable = FALSE; + bIsWritable = sal_False; pInstanceData = new StreamData; SetBufferSize( 8192 ); @@ -150,9 +150,9 @@ SvFileStream::SvFileStream( const String& rFileName, StreamMode nMode ) SvFileStream::SvFileStream() { - bIsOpen = FALSE; + bIsOpen = sal_False; nLockCounter = 0; - bIsWritable = FALSE; + bIsWritable = sal_False; pInstanceData = new StreamData; SetBufferSize( 8192 ); @@ -177,17 +177,9 @@ SvFileStream::~SvFileStream() |* *************************************************************************/ -sal_uInt32 SvFileStream::GetFileHandle() const +sal_uIntPtr SvFileStream::GetFileHandle() const { - // Note that this method is broken on 64-bit as it would return - // only the lower 32 bits of a file handle. (As such, it might be - // that on 64-bit Windows, even in a 64-bit process, the upper 32 - // bits of handles are always zero? But surely we should not rely - // on that.) On the other hand, this method is private in - // SvFileStream and isn't used anywhere for Windows. So make sure - // it doesn't get used in the future either, just abort(). - abort( ); - return 0; + return (sal_uIntPtr)pInstanceData->hFile; } /************************************************************************* @@ -196,7 +188,7 @@ sal_uInt32 SvFileStream::GetFileHandle() const |* *************************************************************************/ -USHORT SvFileStream::IsA() const +sal_uInt16 SvFileStream::IsA() const { return ID_FILESTREAM; } @@ -209,7 +201,7 @@ USHORT SvFileStream::IsA() const |* *************************************************************************/ -ULONG SvFileStream::GetData( void* pData, ULONG nSize ) +sal_uIntPtr SvFileStream::GetData( void* pData, sal_uIntPtr nSize ) { DWORD nCount = 0; if( IsOpen() ) @@ -217,7 +209,7 @@ ULONG SvFileStream::GetData( void* pData, ULONG nSize ) bool bResult = ReadFile(pInstanceData->hFile,(LPVOID)pData,nSize,&nCount,NULL); if( !bResult ) { - ULONG nTestError = GetLastError(); + sal_uIntPtr nTestError = GetLastError(); SetError(::GetSvError( nTestError ) ); } } @@ -230,7 +222,7 @@ ULONG SvFileStream::GetData( void* pData, ULONG nSize ) |* *************************************************************************/ -ULONG SvFileStream::PutData( const void* pData, ULONG nSize ) +sal_uIntPtr SvFileStream::PutData( const void* pData, sal_uIntPtr nSize ) { DWORD nCount = 0; if( IsOpen() ) @@ -247,7 +239,7 @@ ULONG SvFileStream::PutData( const void* pData, ULONG nSize ) |* *************************************************************************/ -ULONG SvFileStream::SeekPos( ULONG nPos ) +sal_uIntPtr SvFileStream::SeekPos( sal_uIntPtr nPos ) { DWORD nNewPos = 0; if( IsOpen() ) @@ -266,7 +258,7 @@ ULONG SvFileStream::SeekPos( ULONG nPos ) } else SetError( SVSTREAM_GENERALERROR ); - return (ULONG)nNewPos; + return (sal_uIntPtr)nNewPos; } /************************************************************************* @@ -275,9 +267,9 @@ ULONG SvFileStream::SeekPos( ULONG nPos ) |* *************************************************************************/ /* -ULONG SvFileStream::Tell() +sal_uIntPtr SvFileStream::Tell() { - ULONG nPos = 0L; + sal_uIntPtr nPos = 0L; if( IsOpen() ) { @@ -314,7 +306,7 @@ void SvFileStream::FlushData() |* *************************************************************************/ -BOOL SvFileStream::LockRange( ULONG nByteOffset, ULONG nBytes ) +sal_Bool SvFileStream::LockRange( sal_uIntPtr nByteOffset, sal_uIntPtr nBytes ) { bool bRetVal = false; if( IsOpen() ) @@ -332,7 +324,7 @@ BOOL SvFileStream::LockRange( ULONG nByteOffset, ULONG nBytes ) |* *************************************************************************/ -BOOL SvFileStream::UnlockRange( ULONG nByteOffset, ULONG nBytes ) +sal_Bool SvFileStream::UnlockRange( sal_uIntPtr nByteOffset, sal_uIntPtr nBytes ) { bool bRetVal = false; if( IsOpen() ) @@ -350,21 +342,21 @@ BOOL SvFileStream::UnlockRange( ULONG nByteOffset, ULONG nBytes ) |* *************************************************************************/ -BOOL SvFileStream::LockFile() +sal_Bool SvFileStream::LockFile() { - BOOL bRetVal = FALSE; + sal_Bool bRetVal = sal_False; if( !nLockCounter ) { if( LockRange( 0L, LONG_MAX ) ) { nLockCounter = 1; - bRetVal = TRUE; + bRetVal = sal_True; } } else { nLockCounter++; - bRetVal = TRUE; + bRetVal = sal_True; } return bRetVal; } @@ -375,9 +367,9 @@ BOOL SvFileStream::LockFile() |* *************************************************************************/ -BOOL SvFileStream::UnlockFile() +sal_Bool SvFileStream::UnlockFile() { - BOOL bRetVal = FALSE; + sal_Bool bRetVal = sal_False; if( nLockCounter > 0) { if( nLockCounter == 1) @@ -385,13 +377,13 @@ BOOL SvFileStream::UnlockFile() if( UnlockRange( 0L, LONG_MAX ) ) { nLockCounter = 0; - bRetVal = TRUE; + bRetVal = sal_True; } } else { nLockCounter--; - bRetVal = TRUE; + bRetVal = sal_True; } } return bRetVal; @@ -506,7 +498,7 @@ void SvFileStream::Open( const String& rFilename, StreamMode nMode ) if( (pInstanceData->hFile==INVALID_HANDLE_VALUE) && (nAccessMode & GENERIC_WRITE)) { - ULONG nErr = ::GetSvError( GetLastError() ); + sal_uIntPtr nErr = ::GetSvError( GetLastError() ); if(nErr==SVSTREAM_ACCESS_DENIED || nErr==SVSTREAM_SHARING_VIOLATION) { nMode &= (~STREAM_WRITE); @@ -531,15 +523,15 @@ void SvFileStream::Open( const String& rFilename, StreamMode nMode ) if( GetLastError() != ERROR_SUCCESS ) { - bIsOpen = FALSE; + bIsOpen = sal_False; SetError(::GetSvError( GetLastError() ) ); } else { - bIsOpen = TRUE; - // pInstanceData->bIsEof = FALSE; + bIsOpen = sal_True; + // pInstanceData->bIsEof = sal_False; if( nAccessMode & GENERIC_WRITE ) - bIsWritable = TRUE; + bIsWritable = sal_True; } SetErrorMode( nOldErrorMode ); } @@ -574,9 +566,9 @@ void SvFileStream::Close() Flush(); CloseHandle( pInstanceData->hFile ); } - bIsOpen = FALSE; + bIsOpen = sal_False; nLockCounter= 0; - bIsWritable = FALSE; + bIsWritable = sal_False; SvStream::ClearBuffer(); SvStream::ClearError(); } @@ -600,24 +592,24 @@ void SvFileStream::ResetError() |* *************************************************************************/ -void SvFileStream::SetSize( ULONG nSize ) +void SvFileStream::SetSize( sal_uIntPtr nSize ) { if( IsOpen() ) { - int bError = FALSE; + int bError = sal_False; HANDLE hFile = pInstanceData->hFile; - ULONG nOld = SetFilePointer( hFile, 0L, NULL, FILE_CURRENT ); + sal_uIntPtr nOld = SetFilePointer( hFile, 0L, NULL, FILE_CURRENT ); if( nOld != 0xffffffff ) { if( SetFilePointer(hFile,nSize,NULL,FILE_BEGIN ) != 0xffffffff) { bool bSucc = SetEndOfFile( hFile ); if( !bSucc ) - bError = TRUE; + bError = sal_True; } if( SetFilePointer( hFile,nOld,NULL,FILE_BEGIN ) == 0xffffffff) - bError = TRUE; + bError = sal_True; } if( bError ) SetError(::GetSvError( GetLastError() ) ); diff --git a/tools/source/stream/vcompat.cxx b/tools/source/stream/vcompat.cxx index 77ab0ef5f840..227c3e05ddca 100644 --- a/tools/source/stream/vcompat.cxx +++ b/tools/source/stream/vcompat.cxx @@ -37,7 +37,7 @@ // - VersionCompat - // ----------------- -VersionCompat::VersionCompat( SvStream& rStm, USHORT nStreamMode, USHORT nVersion ) : +VersionCompat::VersionCompat( SvStream& rStm, sal_uInt16 nStreamMode, sal_uInt16 nVersion ) : mpRWStm ( &rStm ), mnStmMode ( nStreamMode ), mnVersion ( nVersion ) @@ -65,7 +65,7 @@ VersionCompat::~VersionCompat() { if( STREAM_WRITE == mnStmMode ) { - const UINT32 nEndPos = mpRWStm->Tell(); + const sal_uInt32 nEndPos = mpRWStm->Tell(); mpRWStm->Seek( mnCompatPos ); *mpRWStm << ( nEndPos - mnTotalSize ); @@ -73,7 +73,7 @@ VersionCompat::~VersionCompat() } else { - const UINT32 nReadSize = mpRWStm->Tell() - mnCompatPos; + const sal_uInt32 nReadSize = mpRWStm->Tell() - mnCompatPos; if( mnTotalSize > nReadSize ) mpRWStm->SeekRel( mnTotalSize - nReadSize ); |