Rename IFX_Stream to IFGAS_Stream.

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_
 #include <io.h>
 #endif
 
 #include <algorithm>
 #include <memory>
 
 #include "xfa/fgas/crt/fgas_codepage.h"
 
 namespace {
 
 class IFX_StreamImp {

[npm, 2016/12/02 16:23:22]

You probably want to rename all the classes in this namespace as well?

[Tom Sepez, 2016/12/02 18:02:08]

Good suggestion.

  public:
   virtual ~IFX_StreamImp() {}
 
   virtual int32_t GetLength() const = 0;
   virtual int32_t Seek(FX_STREAMSEEK eSeek, int32_t iOffset) = 0;
   virtual int32_t GetPosition() = 0;
   virtual bool IsEOF() const = 0;
   virtual int32_t ReadData(uint8_t* pBuffer, int32_t iBufferSize) = 0;
   virtual int32_t ReadString(FX_WCHAR* pStr,
                              int32_t iMaxLength,
@@ skipping 152 matching lines @@
 };
 
 enum FX_STREAMTYPE {
   FX_SREAMTYPE_Unknown = 0,
   FX_STREAMTYPE_File,
   FX_STREAMTYPE_Buffer,
   FX_STREAMTYPE_Stream,
   FX_STREAMTYPE_BufferRead,
 };
 
-class CFX_Stream : public IFX_Stream {
+class CFGAS_Stream : public IFGAS_Stream {
  public:
-  CFX_Stream();
-  ~CFX_Stream() override;
+  CFGAS_Stream();
+  ~CFGAS_Stream() override;
 
   bool LoadFile(const FX_WCHAR* pszSrcFileName, uint32_t dwAccess);
   bool LoadBuffer(uint8_t* pData, int32_t iTotalSize, uint32_t dwAccess);
   bool LoadFileRead(IFX_SeekableReadStream* pFileRead, uint32_t dwAccess);
   bool LoadFileWrite(IFX_SeekableWriteStream* pFileWrite, uint32_t dwAccess);
   bool LoadBufferRead(IFX_BufferedReadStream* pBufferRead,
                       int32_t iFileSize,
                       uint32_t dwAccess,
                       bool bReleaseBufferRead);
 
-  // IFX_Stream
+  // IFGAS_Stream
   void Release() override;
-  IFX_Stream* Retain() override;
+  IFGAS_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;
   bool IsEOF() const override;
   int32_t ReadData(uint8_t* pBuffer, int32_t iBufferSize) override;
   int32_t ReadString(FX_WCHAR* pStr, int32_t iMaxLength, 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;
   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;
+  IFGAS_Stream* CreateSharedStream(uint32_t dwAccess,
+                                   int32_t iOffset,
+                                   int32_t iLength) override;
 
  protected:
   FX_STREAMTYPE m_eStreamType;
   IFX_StreamImp* m_pStreamImp;
   uint32_t m_dwAccess;
   int32_t m_iTotalSize;
   int32_t m_iPosition;
   int32_t m_iStart;
   int32_t m_iLength;
   int32_t m_iRefCount;
 };
 
-class CFX_TextStream : public IFX_Stream {
+class CFGAS_TextStream : public IFGAS_Stream {
  public:
-  CFX_TextStream(IFX_Stream* pStream, bool bDelStream);
-  ~CFX_TextStream() override;
+  CFGAS_TextStream(IFGAS_Stream* pStream, bool bDelStream);
+  ~CFGAS_TextStream() override;
 
-  // IFX_Stream
+  // IFGAS_Stream
   void Release() override;
-  IFX_Stream* Retain() override;
+  IFGAS_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;
   bool IsEOF() const override;
   int32_t ReadData(uint8_t* pBuffer, int32_t iBufferSize) override;
   int32_t ReadString(FX_WCHAR* pStr, int32_t iMaxLength, 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;
   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;
+  IFGAS_Stream* CreateSharedStream(uint32_t dwAccess,
+                                   int32_t iOffset,
+                                   int32_t iLength) override;
 
  protected:
   uint16_t m_wCodePage;
   int32_t m_wBOMLength;
   uint32_t m_dwBOM;
   uint8_t* m_pBuf;
   int32_t m_iBufSize;
   bool m_bDelStream;
-  IFX_Stream* m_pStreamImp;
+  IFGAS_Stream* m_pStreamImp;
   int32_t m_iRefCount;
   void InitStream();
 };
 
 class CFGAS_FileRead : public IFX_SeekableReadStream {
  public:
-  CFGAS_FileRead(IFX_Stream* pStream, bool bReleaseStream);
+  CFGAS_FileRead(IFGAS_Stream* pStream, bool bReleaseStream);
   ~CFGAS_FileRead() override;
 
   // IFX_SeekableReadStream
   void Release() override;
   FX_FILESIZE GetSize() override;
   bool ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) override;
 
  protected:
   bool m_bReleaseStream;
-  IFX_Stream* m_pStream;
+  IFGAS_Stream* m_pStream;
 };
 
 int32_t FileLength(FXSYS_FILE* file) {
   ASSERT(file);
 #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_
   return _filelength(_fileno(file));
 #else
   int32_t iPos = FXSYS_ftell(file);
   FXSYS_fseek(file, 0, FXSYS_SEEK_END);
   int32_t iLen = FXSYS_ftell(file);
@@ skipping 14 matching lines @@
   ::SetFilePointer(hFile, (int32_t)dwPos, 0, FILE_BEGIN);
   return bRet;
 #else
   return false;
 #endif
 }
 
 }  // namespace
 
 // static
-IFX_Stream* IFX_Stream::CreateStream(IFX_SeekableReadStream* pFileRead,
-                                     uint32_t dwAccess) {
-  CFX_Stream* pSR = new CFX_Stream;
+IFGAS_Stream* IFGAS_Stream::CreateStream(IFX_SeekableReadStream* pFileRead,
+                                         uint32_t dwAccess) {
+  CFGAS_Stream* pSR = new CFGAS_Stream;
   if (!pSR->LoadFileRead(pFileRead, dwAccess)) {
     pSR->Release();
     return nullptr;
   }
   if (dwAccess & FX_STREAMACCESS_Text) {

[npm, 2016/12/02 16:23:22]

Nit: {}

[Tom Sepez, 2016/12/02 18:02:08]

Done.

-    return new CFX_TextStream(pSR, true);
+    return new CFGAS_TextStream(pSR, true);
   }
   return pSR;
 }
 
 // static
-IFX_Stream* IFX_Stream::CreateStream(IFX_SeekableWriteStream* pFileWrite,
-                                     uint32_t dwAccess) {
-  CFX_Stream* pSR = new CFX_Stream;
+IFGAS_Stream* IFGAS_Stream::CreateStream(IFX_SeekableWriteStream* pFileWrite,
+                                         uint32_t dwAccess) {
+  CFGAS_Stream* pSR = new CFGAS_Stream;
   if (!pSR->LoadFileWrite(pFileWrite, dwAccess)) {
     pSR->Release();
     return nullptr;
   }
   if (dwAccess & FX_STREAMACCESS_Text) {

[npm, 2016/12/02 16:23:22]

Nitto

[Tom Sepez, 2016/12/02 18:02:07]

Done.

-    return new CFX_TextStream(pSR, true);
+    return new CFGAS_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;
+IFGAS_Stream* IFGAS_Stream::CreateStream(uint8_t* pData,
+                                         int32_t length,
+                                         uint32_t dwAccess) {
+  CFGAS_Stream* pSR = new CFGAS_Stream;
   if (!pSR->LoadBuffer(pData, length, dwAccess)) {
     pSR->Release();
     return nullptr;
   }
   if (dwAccess & FX_STREAMACCESS_Text) {

[npm, 2016/12/02 16:23:22]

Nitto

[Tom Sepez, 2016/12/02 18:02:08]

Done.

-    return new CFX_TextStream(pSR, true);
+    return new CFGAS_TextStream(pSR, true);
   }
   return pSR;
 }
 
 IFX_StreamImp::IFX_StreamImp() : m_dwAccess(0) {}
 
 CFX_FileStreamImp::CFX_FileStreamImp() : m_hFile(nullptr), m_iLength(0) {}
 
 CFX_FileStreamImp::~CFX_FileStreamImp() {
   if (m_hFile)
@@ skipping 516 matching lines @@
   }
   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,
-                                         bool bDeleteOnRelease) {
+IFGAS_Stream* IFGAS_Stream::CreateTextStream(IFGAS_Stream* pBaseStream,
+                                             bool bDeleteOnRelease) {
   ASSERT(pBaseStream);
-  return new CFX_TextStream(pBaseStream, bDeleteOnRelease);
+  return new CFGAS_TextStream(pBaseStream, bDeleteOnRelease);
 }
 
-CFX_TextStream::CFX_TextStream(IFX_Stream* pStream, bool bDelStream)
+CFGAS_TextStream::CFGAS_TextStream(IFGAS_Stream* pStream, 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);
   m_pStreamImp->Retain();
   InitStream();
 }

[npm, 2016/12/02 16:23:22]

Nits: space needed between methods

[Tom Sepez, 2016/12/02 18:02:08]

Done.

-CFX_TextStream::~CFX_TextStream() {
+CFGAS_TextStream::~CFGAS_TextStream() {
   m_pStreamImp->Release();
   if (m_bDelStream) {
     m_pStreamImp->Release();
   }
   if (m_pBuf) {
     FX_Free(m_pBuf);
   }
 }
-void CFX_TextStream::InitStream() {
+void CFGAS_TextStream::InitStream() {
   int32_t iPosition = m_pStreamImp->GetPosition();
   m_pStreamImp->Seek(FX_STREAMSEEK_Begin, 0);
   m_pStreamImp->ReadData((uint8_t*)&m_dwBOM, 3);
 #if _FX_ENDIAN_ == _FX_LITTLE_ENDIAN_
   m_dwBOM &= 0x00FFFFFF;
   if (m_dwBOM == 0x00BFBBEF) {
     m_wBOMLength = 3;
     m_wCodePage = FX_CODEPAGE_UTF8;
   } else {
     m_dwBOM &= 0x0000FFFF;
@@ skipping 24 matching lines @@
       m_wCodePage = FX_CODEPAGE_UTF16LE;
     } else {
       m_wBOMLength = 0;
       m_dwBOM = 0;
       m_wCodePage = FXSYS_GetACP();
     }
   }
 #endif
   m_pStreamImp->Seek(FX_STREAMSEEK_Begin, std::max(m_wBOMLength, iPosition));
 }
-void CFX_TextStream::Release() {
+void CFGAS_TextStream::Release() {
   if (--m_iRefCount < 1) {
     delete this;
   }
 }
-IFX_Stream* CFX_TextStream::Retain() {
+IFGAS_Stream* CFGAS_TextStream::Retain() {
   m_iRefCount++;
   return this;
 }
-uint32_t CFX_TextStream::GetAccessModes() const {
+uint32_t CFGAS_TextStream::GetAccessModes() const {
   return m_pStreamImp->GetAccessModes() | FX_STREAMACCESS_Text;
 }
-int32_t CFX_TextStream::GetLength() const {
+int32_t CFGAS_TextStream::GetLength() const {
   return m_pStreamImp->GetLength();
 }
-int32_t CFX_TextStream::Seek(FX_STREAMSEEK eSeek, int32_t iOffset) {
+int32_t CFGAS_TextStream::Seek(FX_STREAMSEEK eSeek, int32_t iOffset) {
   return m_pStreamImp->Seek(eSeek, iOffset);
 }
-int32_t CFX_TextStream::GetPosition() {
+int32_t CFGAS_TextStream::GetPosition() {
   return m_pStreamImp->GetPosition();
 }
-bool CFX_TextStream::IsEOF() const {
+bool CFGAS_TextStream::IsEOF() const {
   return m_pStreamImp->IsEOF();
 }
-int32_t CFX_TextStream::ReadData(uint8_t* pBuffer, int32_t iBufferSize) {
+int32_t CFGAS_TextStream::ReadData(uint8_t* pBuffer, int32_t iBufferSize) {
   return m_pStreamImp->ReadData(pBuffer, iBufferSize);
 }
-int32_t CFX_TextStream::WriteData(const uint8_t* pBuffer, int32_t iBufferSize) {
+int32_t CFGAS_TextStream::WriteData(const uint8_t* pBuffer,
+                                    int32_t iBufferSize) {
   return m_pStreamImp->WriteData(pBuffer, iBufferSize);
 }
-void CFX_TextStream::Flush() {
+void CFGAS_TextStream::Flush() {
   m_pStreamImp->Flush();
 }
-bool CFX_TextStream::SetLength(int32_t iLength) {
+bool CFGAS_TextStream::SetLength(int32_t iLength) {
   return m_pStreamImp->SetLength(iLength);
 }
-uint16_t CFX_TextStream::GetCodePage() const {
+uint16_t CFGAS_TextStream::GetCodePage() const {
   return m_wCodePage;
 }
-IFX_Stream* CFX_TextStream::CreateSharedStream(uint32_t dwAccess,
-                                               int32_t iOffset,
-                                               int32_t iLength) {
-  IFX_Stream* pSR =
+IFGAS_Stream* CFGAS_TextStream::CreateSharedStream(uint32_t dwAccess,
+                                                   int32_t iOffset,
+                                                   int32_t iLength) {
+  IFGAS_Stream* pSR =
       m_pStreamImp->CreateSharedStream(dwAccess, iOffset, iLength);
   if (!pSR) {
     return nullptr;
   }
   if (dwAccess & FX_STREAMACCESS_Text) {

[npm, 2016/12/02 16:23:22]

{}

[Tom Sepez, 2016/12/02 18:02:08]

Done.

-    return new CFX_TextStream(pSR, true);
+    return new CFGAS_TextStream(pSR, true);
   }
   return pSR;
 }
-int32_t CFX_TextStream::GetBOM(uint8_t bom[4]) const {
+int32_t CFGAS_TextStream::GetBOM(uint8_t bom[4]) const {
   if (m_wBOMLength < 1) {
     return 0;
   }
   *(uint32_t*)bom = m_dwBOM;
   return m_wBOMLength;
 }
-uint16_t CFX_TextStream::SetCodePage(uint16_t wCodePage) {
+uint16_t CFGAS_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,
-                                   bool& bEOS) {
+int32_t CFGAS_TextStream::ReadString(FX_WCHAR* pStr,
+                                     int32_t iMaxLength,
+                                     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 = iMaxLength * 2;
     iLen = m_pStreamImp->ReadData((uint8_t*)pStr, iBytes);
     iMaxLength = iLen / 2;
@@ skipping 29 matching lines @@
       if (iDecode < 1) {
         return -1;
       }
     } else {
       iMaxLength = 0;
     }
   }
   bEOS = m_pStreamImp->IsEOF();
   return iMaxLength;
 }
-int32_t CFX_TextStream::WriteString(const FX_WCHAR* pStr, int32_t iLength) {
+int32_t CFGAS_TextStream::WriteString(const FX_WCHAR* pStr, int32_t iLength) {
   ASSERT(pStr && iLength > 0);
   if ((m_pStreamImp->GetAccessModes() & FX_STREAMACCESS_Write) == 0) {
     return -1;
   }
   if (m_wCodePage == FX_CODEPAGE_UTF8) {
     int32_t len = iLength;
     CFX_UTF8Encoder encoder;
     while (len-- > 0) {
       encoder.Input(*pStr++);
     }
     CFX_ByteStringC bsResult = encoder.GetResult();
     m_pStreamImp->WriteData((const uint8_t*)bsResult.c_str(),
                             bsResult.GetLength());
   }
   return iLength;
 }
-CFX_Stream::CFX_Stream()
+CFGAS_Stream::CFGAS_Stream()
     : m_eStreamType(FX_SREAMTYPE_Unknown),
       m_pStreamImp(nullptr),
       m_dwAccess(0),
       m_iTotalSize(0),
       m_iPosition(0),
       m_iStart(0),
       m_iLength(0),
       m_iRefCount(1) {}
 
-CFX_Stream::~CFX_Stream() {
+CFGAS_Stream::~CFGAS_Stream() {
   if (m_eStreamType != FX_STREAMTYPE_Stream)
     delete m_pStreamImp;
 }
 
-bool CFX_Stream::LoadFile(const FX_WCHAR* pszSrcFileName, uint32_t dwAccess) {
+bool CFGAS_Stream::LoadFile(const FX_WCHAR* pszSrcFileName, uint32_t dwAccess) {
   if (m_eStreamType != FX_SREAMTYPE_Unknown || m_pStreamImp)
     return false;
 
   if (!pszSrcFileName || FXSYS_wcslen(pszSrcFileName) < 1)
     return false;
 
   std::unique_ptr<CFX_FileStreamImp> pImp(new CFX_FileStreamImp());
   if (!pImp->LoadFile(pszSrcFileName, dwAccess))
     return false;
 
   m_pStreamImp = pImp.release();
   m_eStreamType = FX_STREAMTYPE_File;
   m_dwAccess = dwAccess;
   m_iLength = m_pStreamImp->GetLength();
   return true;
 }
 
-bool CFX_Stream::LoadFileRead(IFX_SeekableReadStream* pFileRead,
-                              uint32_t dwAccess) {
+bool CFGAS_Stream::LoadFileRead(IFX_SeekableReadStream* pFileRead,
+                                uint32_t dwAccess) {
   if (m_eStreamType != FX_SREAMTYPE_Unknown || m_pStreamImp)
     return false;
 
   if (!pFileRead)
     return false;
 
   std::unique_ptr<CFX_FileReadStreamImp> pImp(new CFX_FileReadStreamImp());
   if (!pImp->LoadFileRead(pFileRead, dwAccess))
     return false;
 
   m_pStreamImp = pImp.release();
   m_eStreamType = FX_STREAMTYPE_File;
   m_dwAccess = dwAccess;
   m_iLength = m_pStreamImp->GetLength();
   return true;
 }
 
-bool CFX_Stream::LoadFileWrite(IFX_SeekableWriteStream* pFileWrite,
-                               uint32_t dwAccess) {
+bool CFGAS_Stream::LoadFileWrite(IFX_SeekableWriteStream* pFileWrite,
+                                 uint32_t dwAccess) {
   if (m_eStreamType != FX_SREAMTYPE_Unknown || m_pStreamImp)
     return false;
 
   if (!pFileWrite)
     return false;
 
   std::unique_ptr<CFX_FileWriteStreamImp> pImp(new CFX_FileWriteStreamImp());
   if (!pImp->LoadFileWrite(pFileWrite, dwAccess))
     return false;
 
   m_pStreamImp = pImp.release();
   m_eStreamType = FX_STREAMTYPE_File;
   m_dwAccess = dwAccess;
   m_iLength = m_pStreamImp->GetLength();
   return true;
 }
 
-bool CFX_Stream::LoadBuffer(uint8_t* pData,
-                            int32_t iTotalSize,
-                            uint32_t dwAccess) {
+bool CFGAS_Stream::LoadBuffer(uint8_t* pData,
+                              int32_t iTotalSize,
+                              uint32_t dwAccess) {
   if (m_eStreamType != FX_SREAMTYPE_Unknown || m_pStreamImp)
     return false;
 
   if (!pData || iTotalSize < 1)
     return false;
 
   std::unique_ptr<CFX_BufferStreamImp> pImp(new CFX_BufferStreamImp());
   if (!pImp->LoadBuffer(pData, iTotalSize, dwAccess))
     return false;
 
   m_pStreamImp = pImp.release();
   m_eStreamType = FX_STREAMTYPE_Buffer;
   m_dwAccess = dwAccess;
   m_iLength = m_pStreamImp->GetLength();
   return true;
 }
 
-bool CFX_Stream::LoadBufferRead(IFX_BufferedReadStream* pBufferRead,
-                                int32_t iFileSize,
-                                uint32_t dwAccess,
-                                bool bReleaseBufferRead) {
+bool CFGAS_Stream::LoadBufferRead(IFX_BufferedReadStream* pBufferRead,
+                                  int32_t iFileSize,
+                                  uint32_t dwAccess,
+                                  bool bReleaseBufferRead) {
   if (m_eStreamType != FX_SREAMTYPE_Unknown || m_pStreamImp)
     return false;
 
   if (!pBufferRead)
     return false;
 
   std::unique_ptr<CFX_BufferReadStreamImp> pImp(new CFX_BufferReadStreamImp);
   if (!pImp->LoadBufferRead(pBufferRead, iFileSize, dwAccess,
                             bReleaseBufferRead))
     return false;
 
   m_pStreamImp = pImp.release();
   m_eStreamType = FX_STREAMTYPE_BufferRead;
   m_dwAccess = dwAccess;
   m_iLength = m_pStreamImp->GetLength();
   return true;
 }
 
-void CFX_Stream::Release() {
+void CFGAS_Stream::Release() {
   if (--m_iRefCount < 1) {
     delete this;
   }
 }
-IFX_Stream* CFX_Stream::Retain() {
+IFGAS_Stream* CFGAS_Stream::Retain() {
   m_iRefCount++;
   return this;
 }
 
-uint32_t CFX_Stream::GetAccessModes() const {
+uint32_t CFGAS_Stream::GetAccessModes() const {
   return m_dwAccess;
 }
 
-int32_t CFX_Stream::GetLength() const {
+int32_t CFGAS_Stream::GetLength() const {
   if (!m_pStreamImp) {
     return -1;
   }
   if (m_eStreamType == FX_STREAMTYPE_File ||
       m_eStreamType == FX_STREAMTYPE_Buffer) {
     return m_pStreamImp->GetLength();
   }
   return m_iLength;
 }
-int32_t CFX_Stream::Seek(FX_STREAMSEEK eSeek, int32_t iOffset) {
+int32_t CFGAS_Stream::Seek(FX_STREAMSEEK eSeek, int32_t iOffset) {
   if (!m_pStreamImp) {
     return -1;
   }
   if (m_eStreamType == FX_STREAMTYPE_File ||
       m_eStreamType == FX_STREAMTYPE_Buffer) {
     return m_iPosition = m_pStreamImp->Seek(eSeek, iOffset);
   }
   int32_t iEnd = m_iStart + m_iLength;
   int32_t iPosition = m_iStart + iOffset;
   if (eSeek == FX_STREAMSEEK_Begin) {
     m_iPosition = iPosition;
   } else if (eSeek == FX_STREAMSEEK_Current) {
     m_iPosition += iOffset;
   } else if (eSeek == FX_STREAMSEEK_End) {
     m_iPosition = iEnd + iOffset;
   }
   if (m_iPosition > iEnd) {
     m_iPosition = iEnd;
   }
   if (m_iPosition < m_iStart) {
     m_iPosition = m_iStart;
   }
   return m_iPosition - m_iStart;
 }
-int32_t CFX_Stream::GetPosition() {
+int32_t CFGAS_Stream::GetPosition() {
   if (!m_pStreamImp) {
     return -1;
   }
   if (m_eStreamType == FX_STREAMTYPE_File ||
       m_eStreamType == FX_STREAMTYPE_Buffer) {
     return m_iPosition = m_pStreamImp->GetPosition();
   }
   return m_iPosition - m_iStart;
 }
-bool CFX_Stream::IsEOF() const {
+bool CFGAS_Stream::IsEOF() const {
   if (!m_pStreamImp) {
     return true;
   }
   if (m_eStreamType == FX_STREAMTYPE_File ||
       m_eStreamType == FX_STREAMTYPE_Buffer) {
     return m_pStreamImp->IsEOF();
   }
   return m_iPosition >= m_iStart + m_iLength;
 }
-int32_t CFX_Stream::ReadData(uint8_t* pBuffer, int32_t iBufferSize) {
+int32_t CFGAS_Stream::ReadData(uint8_t* pBuffer, int32_t iBufferSize) {
   ASSERT(pBuffer && iBufferSize > 0);
   if (!m_pStreamImp) {
     return -1;
   }
   int32_t iLen = std::min(m_iStart + m_iLength - m_iPosition, iBufferSize);
   if (iLen <= 0) {
     return 0;
   }
   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, bool& bEOS) {
+int32_t CFGAS_Stream::ReadString(FX_WCHAR* pStr,
+                                 int32_t iMaxLength,
+                                 bool& bEOS) {
   ASSERT(pStr && iMaxLength > 0);
   if (!m_pStreamImp) {
     return -1;
   }
   int32_t iEnd = m_iStart + m_iLength;
   int32_t iLen = iEnd - m_iPosition;
   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) {
     bEOS = true;
   }
   return iLen;
 }
 
-int32_t CFX_Stream::WriteData(const uint8_t* pBuffer, int32_t iBufferSize) {
+int32_t CFGAS_Stream::WriteData(const uint8_t* pBuffer, int32_t iBufferSize) {
   ASSERT(pBuffer && iBufferSize > 0);
   if (!m_pStreamImp) {
     return -1;
   }
   if ((m_dwAccess & FX_STREAMACCESS_Write) == 0) {
     return -1;
   }
   int32_t iLen = iBufferSize;
   if (m_eStreamType == FX_STREAMTYPE_Stream) {
     iLen = std::min(m_iStart + m_iTotalSize - m_iPosition, iBufferSize);
     if (iLen <= 0) {
       return 0;
     }
   }
   int32_t iEnd = m_iStart + m_iLength;
   if (m_pStreamImp->GetPosition() != m_iPosition) {
     m_pStreamImp->Seek(FX_STREAMSEEK_Begin, m_iPosition);
   }
   iLen = m_pStreamImp->WriteData(pBuffer, iLen);
   m_iPosition = m_pStreamImp->GetPosition();
   if (m_iPosition > iEnd) {
     m_iLength = m_iPosition - m_iStart;
   }
   return iLen;
 }
-int32_t CFX_Stream::WriteString(const FX_WCHAR* pStr, int32_t iLength) {
+int32_t CFGAS_Stream::WriteString(const FX_WCHAR* pStr, int32_t iLength) {
   ASSERT(pStr && iLength > 0);
   if (!m_pStreamImp) {
     return -1;
   }
   if ((m_dwAccess & FX_STREAMACCESS_Write) == 0) {
     return -1;
   }
   int32_t iLen = iLength;
   if (m_eStreamType == FX_STREAMTYPE_Stream) {
     iLen = std::min((m_iStart + m_iTotalSize - m_iPosition) / 2, iLength);
     if (iLen <= 0) {
       return 0;
     }
   }
   int32_t iEnd = m_iStart + m_iLength;
   if (m_pStreamImp->GetPosition() != m_iPosition) {
     m_pStreamImp->Seek(FX_STREAMSEEK_Begin, m_iPosition);
   }
   iLen = m_pStreamImp->WriteString(pStr, iLen);
   m_iPosition = m_pStreamImp->GetPosition();
   if (m_iPosition > iEnd) {
     m_iLength = m_iPosition - m_iStart;
   }
   return iLen;
 }
-void CFX_Stream::Flush() {
+void CFGAS_Stream::Flush() {
   if (!m_pStreamImp) {
     return;
   }
   if ((m_dwAccess & FX_STREAMACCESS_Write) == 0) {
     return;
   }
   m_pStreamImp->Flush();
 }
-bool CFX_Stream::SetLength(int32_t iLength) {
+bool CFGAS_Stream::SetLength(int32_t iLength) {
   if (!m_pStreamImp) {
     return false;
   }
   if ((m_dwAccess & FX_STREAMACCESS_Write) == 0) {
     return false;
   }
   return m_pStreamImp->SetLength(iLength);
 }
-int32_t CFX_Stream::GetBOM(uint8_t bom[4]) const {
+int32_t CFGAS_Stream::GetBOM(uint8_t bom[4]) const {
   if (!m_pStreamImp) {
     return -1;
   }
   return 0;
 }
-uint16_t CFX_Stream::GetCodePage() const {
+uint16_t CFGAS_Stream::GetCodePage() const {
 #if _FX_ENDIAN_ == _FX_LITTLE_ENDIAN_
   return FX_CODEPAGE_UTF16LE;
 #else
   return FX_CODEPAGE_UTF16BE;
 #endif
 }
-uint16_t CFX_Stream::SetCodePage(uint16_t wCodePage) {
+uint16_t CFGAS_Stream::SetCodePage(uint16_t wCodePage) {
 #if _FX_ENDIAN_ == _FX_LITTLE_ENDIAN_
   return FX_CODEPAGE_UTF16LE;
 #else
   return FX_CODEPAGE_UTF16BE;
 #endif
 }
-IFX_Stream* CFX_Stream::CreateSharedStream(uint32_t dwAccess,
-                                           int32_t iOffset,
-                                           int32_t iLength) {
+IFGAS_Stream* CFGAS_Stream::CreateSharedStream(uint32_t dwAccess,
+                                               int32_t iOffset,
+                                               int32_t iLength) {
   ASSERT(iLength > 0);
   if (!m_pStreamImp) {
     return nullptr;
   }
   if ((m_dwAccess & FX_STREAMACCESS_Text) != 0 &&
       (dwAccess & FX_STREAMACCESS_Text) == 0) {
     return nullptr;
   }
   if ((m_dwAccess & FX_STREAMACCESS_Write) == 0 &&
       (dwAccess & FX_STREAMACCESS_Write) != 0) {
     return nullptr;
   }
   int32_t iStart = m_iStart + iOffset;
   int32_t iTotal = m_iStart + m_iLength;
   if (iStart < m_iStart || iStart >= iTotal) {
     return nullptr;
   }
   int32_t iEnd = iStart + iLength;
   if (iEnd < iStart || iEnd > iTotal) {
     return nullptr;
   }
-  CFX_Stream* pShared = new CFX_Stream;
+  CFGAS_Stream* pShared = new CFGAS_Stream;
   pShared->m_eStreamType = FX_STREAMTYPE_Stream;
   pShared->m_pStreamImp = m_pStreamImp;
   pShared->m_dwAccess = dwAccess;
   pShared->m_iTotalSize = iLength;
   pShared->m_iPosition = iStart;
   pShared->m_iStart = iStart;
   pShared->m_iLength = (dwAccess & FX_STREAMACCESS_Write) != 0 ? 0 : iLength;
   if (dwAccess & FX_STREAMACCESS_Text) {
-    return IFX_Stream::CreateTextStream(pShared, true);
+    return IFGAS_Stream::CreateTextStream(pShared, true);

[npm, 2016/12/02 16:23:22]

{}

[Tom Sepez, 2016/12/02 18:02:08]

Done.

   }
   return pShared;
 }
 
-IFX_SeekableReadStream* IFX_Stream::MakeSeekableReadStream() {
+IFX_SeekableReadStream* IFGAS_Stream::MakeSeekableReadStream() {
   return new CFGAS_FileRead(this, false);
 }
 
-CFGAS_FileRead::CFGAS_FileRead(IFX_Stream* pStream, bool bReleaseStream)
+CFGAS_FileRead::CFGAS_FileRead(IFGAS_Stream* pStream, bool bReleaseStream)
     : m_bReleaseStream(bReleaseStream), m_pStream(pStream) {
   ASSERT(m_pStream);
 }
 CFGAS_FileRead::~CFGAS_FileRead() {
   if (m_bReleaseStream) {
     m_pStream->Release();
   }
 }
 FX_FILESIZE CFGAS_FileRead::GetSize() {
   return (FX_FILESIZE)m_pStream->GetLength();
 }
 
 bool CFGAS_FileRead::ReadBlock(void* buffer, 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;
 }