Cleanup fgas/crt.

xfa/fgas/crt/fgas_stream.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "xfa/fgas/crt/fgas_stream.h"
 
 #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN32_MOBILE_ || \
     _FX_OS_ == _FX_WIN64_
@@ skipping 209 matching lines @@
   void Release() override;
   IFX_Stream* Retain() override;
   uint32_t GetAccessModes() const override;
   int32_t GetLength() const override;
   int32_t Seek(FX_STREAMSEEK eSeek, int32_t iOffset) override;
   int32_t GetPosition() override;
   FX_BOOL IsEOF() const override;
   int32_t ReadData(uint8_t* pBuffer, int32_t iBufferSize) override;
   int32_t ReadString(FX_WCHAR* pStr,
                      int32_t iMaxLength,
-                     FX_BOOL& bEOS,
-                     int32_t const* pByteSize = nullptr) override;
+                     FX_BOOL& bEOS) override;
   int32_t WriteData(const uint8_t* pBuffer, int32_t iBufferSize) override;
   int32_t WriteString(const FX_WCHAR* pStr, int32_t iLength) override;
   void Flush() override;
   FX_BOOL SetLength(int32_t iLength) override;
   int32_t GetBOM(uint8_t bom[4]) const override;
   uint16_t GetCodePage() const override;
   uint16_t SetCodePage(uint16_t wCodePage) override;
   IFX_Stream* CreateSharedStream(uint32_t dwAccess,
                                  int32_t iOffset,
                                  int32_t iLength) override;
@@ skipping 18 matching lines @@
   void Release() override;
   IFX_Stream* Retain() override;
   uint32_t GetAccessModes() const override;
   int32_t GetLength() const override;
   int32_t Seek(FX_STREAMSEEK eSeek, int32_t iOffset) override;
   int32_t GetPosition() override;
   FX_BOOL IsEOF() const override;
   int32_t ReadData(uint8_t* pBuffer, int32_t iBufferSize) override;
   int32_t ReadString(FX_WCHAR* pStr,
                      int32_t iMaxLength,
-                     FX_BOOL& bEOS,
-                     int32_t const* pByteSize = nullptr) override;
+                     FX_BOOL& bEOS) override;
   int32_t WriteData(const uint8_t* pBuffer, int32_t iBufferSize) override;
   int32_t WriteString(const FX_WCHAR* pStr, int32_t iLength) override;
   void Flush() override;
   FX_BOOL SetLength(int32_t iLength) override;
   int32_t GetBOM(uint8_t bom[4]) const override;
   uint16_t GetCodePage() const override;
   uint16_t SetCodePage(uint16_t wCodePage) override;
   IFX_Stream* CreateSharedStream(uint32_t dwAccess,
                                  int32_t iOffset,
                                  int32_t iLength) override;
@@ skipping 49 matching lines @@
   FX_BOOL bRet = ::SetEndOfFile(hFile);
   ::SetFilePointer(hFile, (int32_t)dwPos, 0, FILE_BEGIN);
   return bRet;
 #else
   return FALSE;
 #endif
 }
 
 }  // namespace
 
-IFX_Stream* IFX_Stream::CreateStream(IFX_BufferRead* pBufferRead,
-                                     uint32_t dwAccess,
-                                     int32_t iFileSize,
-                                     FX_BOOL bReleaseBufferRead) {
-  CFX_Stream* pSR = new CFX_Stream;
-  if (!pSR->LoadBufferRead(pBufferRead, iFileSize, dwAccess,
-                           bReleaseBufferRead)) {
-    pSR->Release();
-    return nullptr;
-  }
-  if (dwAccess & FX_STREAMACCESS_Text) {
-    return new CFX_TextStream(pSR, TRUE);
-  }
-  return pSR;
-}
+// static
 IFX_Stream* IFX_Stream::CreateStream(IFX_FileRead* pFileRead,
                                      uint32_t dwAccess) {
   CFX_Stream* pSR = new CFX_Stream;
   if (!pSR->LoadFileRead(pFileRead, dwAccess)) {
     pSR->Release();
     return nullptr;
   }
   if (dwAccess & FX_STREAMACCESS_Text) {
     return new CFX_TextStream(pSR, TRUE);
   }
   return pSR;
 }
+
+// static
 IFX_Stream* IFX_Stream::CreateStream(IFX_FileWrite* pFileWrite,
                                      uint32_t dwAccess) {
   CFX_Stream* pSR = new CFX_Stream;
   if (!pSR->LoadFileWrite(pFileWrite, dwAccess)) {
     pSR->Release();
     return nullptr;
   }
   if (dwAccess & FX_STREAMACCESS_Text) {
     return new CFX_TextStream(pSR, TRUE);
   }
   return pSR;
 }
-IFX_Stream* IFX_Stream::CreateStream(const FX_WCHAR* pszFileName,
-                                     uint32_t dwAccess) {
-  CFX_Stream* pSR = new CFX_Stream;
-  if (!pSR->LoadFile(pszFileName, dwAccess)) {
-    pSR->Release();
-    return nullptr;
-  }
-  if (dwAccess & FX_STREAMACCESS_Text) {
-    return new CFX_TextStream(pSR, TRUE);
-  }
-  return pSR;
-}
+
+// static
 IFX_Stream* IFX_Stream::CreateStream(uint8_t* pData,
                                      int32_t length,
                                      uint32_t dwAccess) {
   CFX_Stream* pSR = new CFX_Stream;
   if (!pSR->LoadBuffer(pData, length, dwAccess)) {
     pSR->Release();
     return nullptr;
   }
   if (dwAccess & FX_STREAMACCESS_Text) {
     return new CFX_TextStream(pSR, TRUE);
@@ skipping 523 matching lines @@
   if (iLen <= 0) {
     return 0;
   }
   FXSYS_memcpy(m_pData + m_iPosition, pStr, iLen * 2);
   m_iPosition += iLen * 2;
   if (m_iPosition > m_iLength) {
     m_iLength = m_iPosition;
   }
   return iLen;
 }
+
+// static
 IFX_Stream* IFX_Stream::CreateTextStream(IFX_Stream* pBaseStream,
                                          FX_BOOL bDeleteOnRelease) {
   ASSERT(pBaseStream);
   return new CFX_TextStream(pBaseStream, bDeleteOnRelease);
 }
+
 CFX_TextStream::CFX_TextStream(IFX_Stream* pStream, FX_BOOL bDelStream)
     : m_wCodePage(FX_CODEPAGE_DefANSI),
       m_wBOMLength(0),
       m_dwBOM(0),
       m_pBuf(nullptr),
       m_iBufSize(0),
       m_bDelStream(bDelStream),
       m_pStreamImp(pStream),
       m_iRefCount(1) {
   ASSERT(m_pStreamImp);
@@ skipping 116 matching lines @@
 uint16_t CFX_TextStream::SetCodePage(uint16_t wCodePage) {
   if (m_wBOMLength > 0) {
     return m_wCodePage;
   }
   uint16_t v = m_wCodePage;
   m_wCodePage = wCodePage;
   return v;
 }
 int32_t CFX_TextStream::ReadString(FX_WCHAR* pStr,
                                    int32_t iMaxLength,
-                                   FX_BOOL& bEOS,
-                                   int32_t const* pByteSize) {
+                                   FX_BOOL& bEOS) {
   ASSERT(pStr && iMaxLength > 0);
   if (!m_pStreamImp) {
     return -1;
   }
   int32_t iLen;
   if (m_wCodePage == FX_CODEPAGE_UTF16LE ||
       m_wCodePage == FX_CODEPAGE_UTF16BE) {
-    int32_t iBytes = pByteSize ? *pByteSize : iMaxLength * 2;
+    int32_t iBytes = iMaxLength * 2;
     iLen = m_pStreamImp->ReadData((uint8_t*)pStr, iBytes);
     iMaxLength = iLen / 2;
     if (sizeof(FX_WCHAR) > 2) {
       FX_UTF16ToWChar(pStr, iMaxLength);
     }
 #if _FX_ENDIAN_ == _FX_BIG_ENDIAN_
     if (m_wCodePage == FX_CODEPAGE_UTF16LE) {
       FX_SwapByteOrder(pStr, iMaxLength);
     }
 #else
     if (m_wCodePage == FX_CODEPAGE_UTF16BE) {
       FX_SwapByteOrder(pStr, iMaxLength);
     }
 #endif
   } else {
     int32_t pos = m_pStreamImp->GetPosition();
-    int32_t iBytes = pByteSize ? *pByteSize : iMaxLength;
+    int32_t iBytes = iMaxLength;
     iBytes = std::min(iBytes, m_pStreamImp->GetLength() - pos);
     if (iBytes > 0) {
       if (!m_pBuf) {
         m_pBuf = FX_Alloc(uint8_t, iBytes);
         m_iBufSize = iBytes;
       } else if (iBytes > m_iBufSize) {
         m_pBuf = FX_Realloc(uint8_t, m_pBuf, iBytes);
         m_iBufSize = iBytes;
       }
       iLen = m_pStreamImp->ReadData(m_pBuf, iBytes);
@@ skipping 221 matching lines @@
   }
   if (m_pStreamImp->GetPosition() != m_iPosition) {
     m_pStreamImp->Seek(FX_STREAMSEEK_Begin, m_iPosition);
   }
   iLen = m_pStreamImp->ReadData(pBuffer, iLen);
   m_iPosition = m_pStreamImp->GetPosition();
   return iLen;
 }
 int32_t CFX_Stream::ReadString(FX_WCHAR* pStr,
                                int32_t iMaxLength,
-                               FX_BOOL& bEOS,
-                               int32_t const* pByteSize) {
+                               FX_BOOL& bEOS) {
   ASSERT(pStr && iMaxLength > 0);
   if (!m_pStreamImp) {
     return -1;
   }
   int32_t iEnd = m_iStart + m_iLength;
   int32_t iLen = iEnd - m_iPosition;
-  if (pByteSize) {
-    iLen = std::min(iLen, *pByteSize);
-  }
   iLen = std::min(iEnd / 2, iMaxLength);
   if (iLen <= 0) {
     return 0;
   }
   if (m_pStreamImp->GetPosition() != m_iPosition) {
     m_pStreamImp->Seek(FX_STREAMSEEK_Begin, m_iPosition);
   }
   iLen = m_pStreamImp->ReadString(pStr, iLen, bEOS);
   m_iPosition = m_pStreamImp->GetPosition();
   if (iLen > 0 && m_iPosition >= iEnd) {
@@ skipping 150 matching lines @@
                                   FX_FILESIZE offset,
                                   size_t size) {
   m_pStream->Seek(FX_STREAMSEEK_Begin, (int32_t)offset);
   int32_t iLen = m_pStream->ReadData((uint8_t*)buffer, (int32_t)size);
   return iLen == (int32_t)size;
 }
 
 void CFGAS_FileRead::Release() {
   delete this;
 }